Merge tag 'gpsbabel_1_5_4' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Mon, 28 Aug 2017 19:22:52 +0000 (21:22 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 28 Aug 2017 19:22:52 +0000 (21:22 +0200)
gpsbabel_1_5_4


Trivial merge